Make this work when called from gtk_combo_box_destroy(). (#172999,

2005-04-08  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkcombobox.c (gtk_combo_box_popdown): Make this
	work when called from gtk_combo_box_destroy().  (#172999,
	Christian Persch)

diff --git a/ChangeLog b/ChangeLog
index 5c42d1eb5a7e55b2eb0e20209ff000c51c778812..97f8f9a3dd353884044f316ade4568edc3650b83 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,12 @@
        * gdk/gdkpixbuf-render.c: (gdk_pixbuf_set_as_cairo_source): Track
        cairo API change in signedness of data argument.
 
+2005-04-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_popdown): Make this
+       work when called from gtk_combo_box_destroy().  (#172999,
+       Christian Persch)
+
 2005-04-08  Matthias Clasen  <mclasen@redhat.com>
 
        Fix double-click to autosize treeview columns. This was

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5c42d1eb5a7e55b2eb0e20209ff000c51c778812..97f8f9a3dd353884044f316ade4568edc3650b83 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -6,6 +6,12 @@
        * gdk/gdkpixbuf-render.c: (gdk_pixbuf_set_as_cairo_source): Track
        cairo API change in signedness of data argument.
 
+2005-04-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_popdown): Make this
+       work when called from gtk_combo_box_destroy().  (#172999,
+       Christian Persch)
+
 2005-04-08  Matthias Clasen  <mclasen@redhat.com>
 
        Fix double-click to autosize treeview columns. This was

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5c42d1eb5a7e55b2eb0e20209ff000c51c778812..97f8f9a3dd353884044f316ade4568edc3650b83 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -6,6 +6,12 @@
        * gdk/gdkpixbuf-render.c: (gdk_pixbuf_set_as_cairo_source): Track
        cairo API change in signedness of data argument.
 
+2005-04-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_popdown): Make this
+       work when called from gtk_combo_box_destroy().  (#172999,
+       Christian Persch)
+
 2005-04-08  Matthias Clasen  <mclasen@redhat.com>
 
        Fix double-click to autosize treeview columns. This was

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index f451523b21912f79cc1eceb153c11cfce8ece8cb..f66a63cc312983720c80d772481a3d2903d4639d 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,6 +1,7 @@
 2005-04-08  Matthias Clasen  <mclasen@redhat.com>
 
-       * io-pcx.c: No debugging output, please.
+       * io-pcx.c: No debugging output, please. (#173107,
+       John Ellis)
 
 2005-04-07  Matthias Clasen  <mclasen@redhat.com>
 

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 0d80a5cf221774528904e234b5ef746b79faec6f..e81823d86412129d25278ec7dcf32cac6a487dc3 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -1670,15 +1670,15 @@ gtk_combo_box_popdown (GtkComboBox *combo_box)
 {
   g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
 
-  if (!GTK_WIDGET_REALIZED (GTK_WIDGET (combo_box)))
-    return;
-
   if (GTK_IS_MENU (combo_box->priv->popup_widget))
     {
       gtk_menu_popdown (GTK_MENU (combo_box->priv->popup_widget));
       return;
     }
 
+  if (!GTK_WIDGET_REALIZED (GTK_WIDGET (combo_box)))
+    return;
+
   gtk_combo_box_list_remove_grabs (combo_box);
 
   gtk_widget_hide_all (combo_box->priv->popup_window);